[scudo] Fix isOwned on MTE devices. #111060
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
compiler-rt
compiler-rt:scudo
Member
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Evgenii Stepanov (eugenis) ChangesIf called on address that is actually not owned, the tags could not match. Disable tag checks in isOwned(). Full diff: https://github.com/llvm/llvm-project/pull/111060.diff 2 Files Affected:
diff --git a/compiler-rt/lib/scudo/standalone/combined.h b/compiler-rt/lib/scudo/standalone/combined.h
index a5f1bc388e8824..323a8b9d76c994 100644
--- a/compiler-rt/lib/scudo/standalone/combined.h
+++ b/compiler-rt/lib/scudo/standalone/combined.h
@@ -785,6 +785,9 @@ class Allocator {
// A corrupted chunk will not be reported as owned, which is WAI.
bool isOwned(const void *Ptr) {
initThreadMaybe();
+ // If the allocation is not owned, the tags could be wrong.
+ ScopedDisableMemoryTagChecks x(
+ useMemoryTagging<AllocatorConfig>(Primary.Options.load()));
#ifdef GWP_ASAN_HOOKS
if (GuardedAlloc.pointerIsMine(Ptr))
return true;
diff --git a/compiler-rt/lib/scudo/standalone/memtag.h b/compiler-rt/lib/scudo/standalone/memtag.h
index 1f6983e99404a2..06a2ed275e9afb 100644
--- a/compiler-rt/lib/scudo/standalone/memtag.h
+++ b/compiler-rt/lib/scudo/standalone/memtag.h
@@ -122,9 +122,12 @@ inline NORETURN void enableSystemMemoryTaggingTestOnly() {
class ScopedDisableMemoryTagChecks {
uptr PrevTCO;
+ bool active;
public:
- ScopedDisableMemoryTagChecks() {
+ ScopedDisableMemoryTagChecks(bool cond = true) : active(cond) {
+ if (!active)
+ return;
__asm__ __volatile__(
R"(
.arch_extension memtag
@@ -135,6 +138,8 @@ class ScopedDisableMemoryTagChecks {
}
~ScopedDisableMemoryTagChecks() {
+ if (!active)
+ return;
__asm__ __volatile__(
R"(
.arch_extension memtag
@@ -269,7 +274,7 @@ inline NORETURN void enableSystemMemoryTaggingTestOnly() {
}
struct ScopedDisableMemoryTagChecks {
- ScopedDisableMemoryTagChecks() {}
+ ScopedDisableMemoryTagChecks(bool cond UNUSED = true) {}
};
inline NORETURN uptr selectRandomTag(uptr Ptr, uptr ExcludeMask) {
|
fmayer
approved these changes
Oct 3, 2024
If called on address that is actually not owned, the tags could not match. Disable tag checks in isOwned().
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If called on address that is actually not owned, the tags could not match. Disable tag checks in isOwned().